# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1496.1.10 -> 1.1496.1.11 # arch/ia64/kernel/ia64_ksyms.c 1.34 -> 1.35 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/12/13 davidm@tiger.hpl.hp.com 1.1502 # Merge tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5 # into tiger.hpl.hp.com:/data1/bk/lia64/linux-ia64-2.5 # -------------------------------------------- # 03/12/16 davidm@tiger.hpl.hp.com 1.1496.1.11 # ia64: Bring export of spin-lock contention-routines in sync with # this change: Jim Wilson says that gcc v3.3 also supports # marking ar.pfs as clobbered, so use ia64_spinlock_contention() # for any GCC with v3.3 or newer. # -------------------------------------------- # diff -Nru a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c --- a/arch/ia64/kernel/ia64_ksyms.c Wed Dec 17 00:38:57 2003 +++ b/arch/ia64/kernel/ia64_ksyms.c Wed Dec 17 00:38:57 2003 @@ -189,7 +189,7 @@ EXPORT_SYMBOL(unw_access_pr); #ifdef CONFIG_SMP -# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4) +# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3) /* * This is not a normal routine and we don't want a function descriptor for it, so we use * a fake declaration here.